Skip to content
This repository has been archived by the owner on Aug 5, 2022. It is now read-only.

Upgrade scalapb #12

Open
wants to merge 147 commits into
base: master
Choose a base branch
from
Open

Upgrade scalapb #12

wants to merge 147 commits into from

Conversation

tian000
Copy link

@tian000 tian000 commented Apr 7, 2020

Upgrade scalapb so that we can use the same version of scalapb lens and sparksql-scalapb

laurentlb and others added 30 commits May 24, 2019 08:23
…azelbuild#759)

This allows the bazel test runner correctly generate the test log, based only on tests that actually did run.
* move collect_plugin_paths to common.bzl

* add scala_doc rule + aspect implementations

* add basic scala_doc Markdown documentation

* add scala_doc example

* collect plugins in aspect too

* declare_directory for scaldoc output path or else it complains

* add a simple test target for scala_doc rule

* add doc note about scaladoc being kind of slow

* fix scala_doc.md code block

* privatize scaladoc aspect

* get more src_files/compile_jars

* also accept scalacopts in scala_doc

* turn off scaladoc warnings for now

* use host_path_separator in classpath
fix the string `scala_doc` which was copy-pasted as `scala_binary`
This will be required by Bazel 0.27, where the flag
`--incompatible_no_support_tools_in_action_inputs` will be on by
default.

The function `collect_plugin_paths` iterates over its argument, so we
need to flatten the depset.
…te (bazelbuild#764)

* PlusOne propagates PlusOne deps of exports

* rename of tests

* correct test dependency

* use scala toolchain to toggle on +1 collection
* fix grpc opencensus stats integration
- upgrade opencensus-java packages to the latest (0.22.1)
- add opencensus-impl and opencensus-impl-core

* add opencensus-impl transitive dependency com.lmax:disruptor
* Specify which version of bazel is required.

* Update README.md
* Specs2 now will create its JUnit Description tree with filtered child items

* Creating a filtered description tree from Specs2 utilities - keeps ordering and hashCodes intact

* Redirecting test error output
* Migrate from java_common.create_provider to JavaInfo()

* Fix scala/private/common.bzl

* Fix some build failures.

* Fix some more builds.

* Remove scala/private/common:create_java_provider

* Remove unused _create_provider.

* Remove unused load statement

* Also propagate deps and runtime_deps in scala_import with no jars.

* Address review comments.

* Update custom-jvm-rule.bzl

* Update BUILD

* typo

* Removed implicit value for deps_providers.

* Add dummy intermediate jar file for scala_import with no jars.

* Cleanup code.

* Replace + with lists extend.

* Revert enabling --all_incompatible_changes test by mistake.
* expose source_jar in JavaInfo

* nit: clarify conditional

* nit: replace one hack with another

* nit: replace concat with append

* remove "main" attr usage

it's no longer needed

* add comment
…onstruction speed (bazelbuild#736)

* Import java_stub_template from bazelbuild@8b8271e

* Port changes from bazelbuild/bazel#8196

* Remove java_stub_template from WORKSPACE

* Update java_stub_template archive URL

* Make java_stub_template a normal file
* a JavaInfo provider should be given for deps

* flatten providers lists

* Revert "flatten providers lists"

This reverts commit a464f61.
* Allow for code coverage to be run on 0.27.1

* Update expected-coverage.dat

* actually remove all merge conflicts

remove scala_doc
merge conflict


spacing


newline
resolve_command shouldn't be required here.
bazelbuild#801)

* Add test for host deps

* Add a test hopefully to illustrate host deps

* Update test

* Change api usage to use binds

* Remove errant print

* See if behavior is different on 0.28.1

* incompatible_string_join_requires_strings: string.join(list) accepts invalid (non-string) list elements

* Add a to_list

* Another case of depset iterable

* Windows ci can only support 0.28.0 via chocolaty right now
* Add scalac_jvm_flags to scala_toolchain

This allows things like setting the max heap on all Scalac workers.

* Add docs

* Fix comment

* Add enable_code_coverage_aspect to the docs

* Flags on target should override flags on toolchain.

Also fix comment.
* Add scala_test_jvm_flags to the toolchain

* Fix package name

* Fix target names

* Add trivial test suite and rename some things

* Wrap all jvm_flags in _expand_location
* Remove the deprecated attribute proto_source_root.

Replace it with strip_import_prefix, its spiritual successor.

* Update Bazel version on Travis

* Update rules_scala to work with Bazel >=0.27.

The flag --incompatible_string_join_requires_strings was flipped, which
this repository was incompatible with.

* Update to Bazel 0.26 instead.

test_coverage_on fails for some mysterious reason that seems unrelated to the cleanup crusade I'm pursuing at the moment.

* add point release number so that downloading Bazel succeeds

* change whitespace to re-trigger build

* update Bazel version, hopefully properly

* update test_expected_failure/

* minimize diff

* re-trigger Travis

* re-trigger Travis again
note the last version of 0.23 that we ran CI on.
ittaiz and others added 18 commits February 18, 2020 09:03
They looked at Bazel but didn't adopt
* Scalafmt 2.12 support

* Upgrade scalafmt version
* Fix source pathing for code coverage

* lint fixes hopefully?

* lint? idk what's going on here

* Rename in_out_pair to records

* Remove bad assumptions about how bazel works

* Clean up lingering srcs

Clean up lingering srcs

* this commit should fail tests

* this commit should pass tests

* let this test actually fail the CI

* update comments

* Refactor src_paths

* spelling is hard
…azelbuild#1012)

Version taken from scala/private/macros/scala_repositories.bzl.
Previous version from docs was conflicting with actual version of zlib.
)

* Return resource's short_path when fail to find relative
* Add tests for imports

* update
…#980)

* use bind to remove loader-specific labels in dependencies

* remove redundant bind
* Documentation for coverage support

* Coverage: update example script to use combined coverage report

* Coverage docs: adding note about only being tested with ScalaTest
* add fetch sources to scala_repositories

* adding fetch_sources to WORKSPACE
* upgrading scalapb

* lint fix

* fix checksum

* fixed build and tests by including additional grpc dependencies
@tian000
Copy link
Author

tian000 commented Apr 7, 2020

This has already been merged to the bazelbuild repo. I am just merging from upstream.

@mattforbes-gr
Copy link

FYI we are using a forked version of sparksql-scalapb but they have added support for the automatic unwrapping that we added in our version. What version of this is being upgraded to?

@tian000
Copy link
Author

tian000 commented Apr 7, 2020

@mattforbes-gr this upgrades scalapb to 0.9.7

@tian000
Copy link
Author

tian000 commented Apr 7, 2020

Does 0.9.7 have what you want? It is the latest version that support scala 2.11 and 2.12 future versions will no longer support scala 2.11.

Rules scala maintainer says that maybe they'll deprecate 2.11 soon? bazelbuild#667

@mattforbes-gr
Copy link

scalapb doesn't actually depend on spark-scalapb so this should be fine, I can just add a separate dependency on the spark library.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.